From: Greg Kroah-Hartman Date: Mon, 27 Jan 2014 13:44:53 +0000 (-0800) Subject: Merge branch 'master' into staging-next X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~7192^2~2 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/%22bookmarks:/?a=commitdiff_plain;h=cc11f372e9371ec3a3dad02396dbe0a55eec0b8f;p=linux-4.9.git Merge branch 'master' into staging-next We need the network changes in staging-next in order to be able to fix up the rtl8821ae driver to build properly. Signed-off-by: Greg Kroah-Hartman --- cc11f372e9371ec3a3dad02396dbe0a55eec0b8f